popupMenu: Fix closing submenus when clicking on the expander

We need to make sure that we reset the opened submenu when we close the
submenu, not trick the toplevel into thinking a closed submenu is the
currently opened menu.

https://bugzilla.gnome.org/show_bug.cgi?id=704336

diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
index b8503bf762f6006c664114c4e9c66d7088a056f0..7aaecf52df69a3733a64ade2654dabf36d73b9ee 100644 (file)
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -1369,12 +1369,13 @@ const PopupSubMenuMenuItem = new Lang.Class({
     },
 
     _subMenuOpenStateChanged: function(menu, open) {
-        if (open)
+        if (open) {
             this.actor.add_style_pseudo_class('open');
-        else
+            this._getTopMenu()._setOpenedSubMenu(this.menu);
+        } else {
             this.actor.remove_style_pseudo_class('open');
-
-        this._getTopMenu()._setOpenedSubMenu(this.menu);
+            this._getTopMenu()._setOpenedSubMenu(null);
+        }
     },
 
     destroy: function() {